bluetooth: Remove unused 'had-bluetooth-devices-setup' setting

Now that we always show the Bluetooth switch when there's a Bluetooth
adapter hiding somewhere, remove all the settings it used as storage.

If the user wants to really really disable any Bluetooth adapters in
their system, the gnome-bluetooth documentation explains how to do that
irrespective of GNOME:
https://gitlab.gnome.org/GNOME/gnome-bluetooth/#multiple-bluetooth-adapters

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2488>

diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index c56a3399ebd5b3b5cffc7e47139952475a90f6ee..86ad1b24b5d28cd0af22e6f10bb5d0188f0c391b 100644 (file)
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -84,16 +84,6 @@
         This key sets the default state of the checkbox.
       </description>
     </key>
-    <key name="had-bluetooth-devices-setup" type="b">
-      <default>false</default>
-      <summary>Whether the default Bluetooth adapter had set up devices associated to it</summary>
-      <description>
-        The shell will only show a Bluetooth menu item if a Bluetooth
-        adapter is powered, or if there were devices set up associated
-        with the default adapter. This will be reset if the default
-        adapter is ever seen not to have devices associated to it.
-      </description>
-    </key>
     <key name="last-selected-power-profile" type="s">
       <default>"power-saver"</default>
       <summary>The last selected non-default power profile</summary>

diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index f5ed1775b1c627c7591d87170bd007ad4af3864e..bbff62da7fc0bbd27200fc138c04a9cd7c434e14 100644 (file)
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -15,8 +15,6 @@ const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 const RfkillManagerInterface = loadInterfaceXML('org.gnome.SettingsDaemon.Rfkill');
 const rfkillManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(RfkillManagerInterface);
 
-const HAD_BLUETOOTH_DEVICES_SETUP = 'had-bluetooth-devices-setup';
-
 const BtClient = GObject.registerClass({
     Properties: {
         'available': GObject.ParamSpec.boolean('available', '', '',
@@ -36,8 +34,6 @@ const BtClient = GObject.registerClass({
     _init() {
         super._init();
 
-        this._hadSetupDevices = global.settings.get_boolean(HAD_BLUETOOTH_DEVICES_SETUP);
-
         this._client = new GnomeBluetooth.Client();
         this._client.connect('notify::default-adapter-powered', () => {
             this.notify('active');
@@ -128,29 +124,12 @@ const BtClient = GObject.registerClass({
         if (this._devicesChangedId)
             return;
         this._devicesChangedId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-            this._syncHadSetupDevices();
             delete this._devicesChangedId;
             this.emit('devices-changed');
             return GLib.SOURCE_REMOVE;
         });
     }
 
-    _syncHadSetupDevices() {
-        const {defaultAdapter} = this._client;
-        if (!defaultAdapter || !this._adapter)
-            return; // ignore changes while powering up/down
-
-        const [firstDevice] = this.getDevices();
-        const hadSetupDevices = !!firstDevice;
-
-        if (this._hadSetupDevices === hadSetupDevices)
-            return;
-
-        this._hadSetupDevices = hadSetupDevices;
-        global.settings.set_boolean(
-            HAD_BLUETOOTH_DEVICES_SETUP, this._hadSetupDevices);
-    }
-
     _connectDeviceNotify(device) {
         const path = device.get_object_path();